🌎 rns.kin.earth git 🌍
Commit 9eff138c3cb9fa832029e7fc9028a3e0467ae6d2
Parents : b0fb5d1
Author : Mark Qvist <mark@unsigned.io>
Date : 2025-12-22T14:23:27+01:00
Added fixed MTU configuration to TCPClientInterface
Changes
2 files changed, 16 insertions(+), 6 deletions(-)
Diff
diff --git a/RNS/Interfaces/TCPInterface.py b/RNS/Interfaces/TCPInterface.py
index 0a152205..6c4acef4 100644
--- a/RNS/Interfaces/TCPInterface.py
+++ b/RNS/Interfaces/TCPInterface.py
@@ -107,8 +107,13 @@ class TCPClientInterface(Interface):
i2p_tunneled = c.as_bool("i2p_tunneled") if "i2p_tunneled" in c else False
connect_timeout = c.as_int("connect_timeout") if "connect_timeout" in c else None
max_reconnect_tries = c.as_int("max_reconnect_tries") if "max_reconnect_tries" in c else None
+ fixed_mtu = c.as_int("fixed_mtu") if "fixed_mtu" in c else None
+ if fixed_mtu:
+ if fixed_mtu < RNS.Reticulum.MTU: raise ValueError(f"Configured MTU of {fixed_mtu} bytes is too small")
+ self.AUTOCONFIGURE_MTU = False
+ self.FIXED_MTU = True
- self.HW_MTU = TCPInterface.HW_MTU
+ self.HW_MTU = TCPInterface.HW_MTU if not fixed_mtu else fixed_mtu
self.IN = True
self.OUT = False
self.socket = None
diff --git a/RNS/Transport.py b/RNS/Transport.py
index 8e7f805b..cf2bb78f 100755
--- a/RNS/Transport.py
+++ b/RNS/Transport.py
@@ -1367,22 +1367,27 @@ class Transport:
path_mtu = RNS.Link.mtu_from_lr_packet(packet)
mode = RNS.Link.mode_from_lr_packet(packet)
+ ph_mtu = interface.HW_MTU if interface else None
nh_mtu = outbound_interface.HW_MTU
if path_mtu:
+ # TODO: Remove debug
+ # RNS.log(f"PATH_MTU: {path_mtu}")
+ # RNS.log(f"PH_MTU: {ph_mtu}")
+ # RNS.log(f"NH_MTU: {nh_mtu}")
if outbound_interface.HW_MTU == None:
- RNS.log(f"No next-hop HW MTU, disabling link MTU upgrade", RNS.LOG_DEBUG) # TODO: Remove debug
+ RNS.log(f"No next-hop HW MTU, disabling link MTU upgrade", RNS.LOG_DEBUG)
path_mtu = None
new_raw = new_raw[:-RNS.Link.LINK_MTU_SIZE]
elif not outbound_interface.AUTOCONFIGURE_MTU and not outbound_interface.FIXED_MTU:
- RNS.log(f"Outbound interface doesn't support MTU autoconfiguration, disabling link MTU upgrade", RNS.LOG_DEBUG) # TODO: Remove debug
+ RNS.log(f"Outbound interface doesn't support MTU autoconfiguration, disabling link MTU upgrade", RNS.LOG_DEBUG)
path_mtu = None
new_raw = new_raw[:-RNS.Link.LINK_MTU_SIZE]
else:
- if nh_mtu < path_mtu:
+ if nh_mtu < path_mtu or (ph_mtu and ph_mtu < path_mtu):
try:
- path_mtu = nh_mtu
+ path_mtu = min(nh_mtu, ph_mtu)
clamped_mtu = RNS.Link.signalling_bytes(path_mtu, mode)
- RNS.log(f"Clamping link MTU to {RNS.prettysize(nh_mtu)}", RNS.LOG_DEBUG) # TODO: Remove debug
+ RNS.log(f"Clamping link MTU to {RNS.prettysize(path_mtu)}", RNS.LOG_DEBUG)
new_raw = new_raw[:-RNS.Link.LINK_MTU_SIZE]+clamped_mtu
except Exception as e:
RNS.log(f"Dropping link request packet. The contained exception was: {e}", RNS.LOG_WARNING)
Served by rngit 1.5.2 - Generated in 0.06s